From ab0d21225127df3ba70baca0cb3d686cad52bfc4 Mon Sep 17 00:00:00 2001 From: "kfraser@localhost.localdomain" Date: Thu, 17 Aug 2006 19:24:20 +0100 Subject: [PATCH] [SVM] Fix 64-bit VMRUN. Signed-off-by: Keir Fraser --- xen/arch/x86/hvm/svm/x86_64/exits.S | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/xen/arch/x86/hvm/svm/x86_64/exits.S b/xen/arch/x86/hvm/svm/x86_64/exits.S index 184c10cc1e..248a58f131 100644 --- a/xen/arch/x86/hvm/svm/x86_64/exits.S +++ b/xen/arch/x86/hvm/svm/x86_64/exits.S @@ -107,8 +107,7 @@ ENTRY(svm_asm_do_launch) movq %rax, VMCB_rax(%rcx) leaq root_vmcb_pa(%rip), %rax movl VCPU_processor(%rbx), %ecx - shll $3, %ecx - addq %rcx, %rax + movq (%rax,%rcx,8), %rax VMSAVE movq VCPU_svm_vmcb_pa(%rbx), %rax @@ -139,10 +138,9 @@ ENTRY(svm_asm_do_launch) HVM_SAVE_ALL_NOSEGREGS GET_CURRENT(%rbx) - movl VCPU_processor(%rbx), %ecx leaq root_vmcb_pa(%rip), %rax - shll $3, %ecx - addq %rcx, %rax + movl VCPU_processor(%rbx), %ecx + movq (%rax,%rcx,8), %rax VMLOAD STGI -- 2.30.2